Overview: don't use the overlay_group

It's a deprecated concept, and we want to have our own actor
that we can add to the chrome to handle the input region.

https://bugzilla.gnome.org/show_bug.cgi?id=700735

diff --git a/js/ui/layout.js b/js/ui/layout.js
index c493292430ca7656861e6c087d9f8adeb63c1dc8..7ae6d49d41ddff2b6ec2d31fdeaf6e79dac98808 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -190,7 +190,9 @@ const LayoutManager = new Lang.Class({
         this.uiGroup.add_actor(global.window_group);
 
         global.stage.remove_actor(global.overlay_group);
-        this.uiGroup.add_actor(global.overlay_group);
+        this.overviewGroup = new St.Widget({ name: 'overviewGroup' });
+        this.uiGroup.add_actor(this.overviewGroup);
+
         global.stage.add_child(this.uiGroup);
 
         this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 27c2b7ccd8b0940e470a67a510266744dfc96d99..e2db331d91c3e053a33019f4837e764feec73cfa 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1658,7 +1658,7 @@ const MessageTray = new Lang.Class({
 
         this.clearableCount = 0;
 
-        this._lightbox = new Lightbox.Lightbox(global.overlay_group,
+        this._lightbox = new Lightbox.Lightbox(Main.layoutManager.overviewGroup,
                                                { inhibitEvents: true,
                                                  fadeInTime: ANIMATION_TIME,
                                                  fadeOutTime: ANIMATION_TIME,
@@ -2344,7 +2344,7 @@ const MessageTray = new Lang.Class({
 
         if (this._desktopClone)
             this._desktopClone.destroy();
-        let cloneSource = Main.overview.visible ? global.overlay_group : global.window_group;
+        let cloneSource = Main.overview.visible ? Main.layoutManager.overviewGroup : global.window_group;
         this._desktopClone = new Clutter.Clone({ source: cloneSource,
                                                  clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
         Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);

diff --git a/js/ui/overview.js b/js/ui/overview.js
index d49f51a4aefc0cc8658545f0dd20bb9e2e763bb6..bc8e8979d3f8a1c9a9895dedb16aa3415e8d47f3 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -115,7 +115,7 @@ const Overview = new Lang.Class({
         let monitor = Main.layoutManager.primaryMonitor;
 
         this._desktopFade = new St.Bin();
-        global.overlay_group.add_actor(this._desktopFade);
+        Main.layoutManager.overviewGroup.add_child(this._desktopFade);
 
         let layout = new Clutter.BinLayout();
         this._stack = new Clutter.Actor({ layout_manager: layout });
@@ -132,7 +132,7 @@ const Overview = new Lang.Class({
         this._overview._delegate = this;
 
         this._backgroundGroup = new Meta.BackgroundGroup();
-        global.overlay_group.add_child(this._backgroundGroup);
+        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
         this._backgroundGroup.hide();
         this._bgManagers = [];
 
@@ -154,7 +154,7 @@ const Overview = new Lang.Class({
 
         this._stack.hide();
         this._stack.add_actor(this._overview);
-        global.overlay_group.add_actor(this._stack);
+        Main.layoutManager.overviewGroup.add_child(this._stack);
 
         this._coverPane.hide();
 

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 2f4730873992d8044d4d5b4e24927a3af5e37934..25140a8f11a1a0330ecc9ea95b91f7132ede77e3 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -137,7 +137,7 @@ const WorkspacesView = new Lang.Class({
             let ws = new Workspace.Workspace(null, i);
             ws.setFullGeometry(monitors[i]);
             ws.setActualGeometry(monitors[i]);
-            global.overlay_group.add_actor(ws.actor);
+            Main.layoutManager.overviewGroup.add_actor(ws.actor);
             this._extraWorkspaces.push(ws);
         }
     },
@@ -594,7 +594,7 @@ const WorkspacesDisplay = new Lang.Class({
         this._updateWorkspacesActualGeometry();
 
         for (let i = 0; i < this._workspacesViews.length; i++)
-            global.overlay_group.add_actor(this._workspacesViews[i].actor);
+            Main.layoutManager.overviewGroup.add_actor(this._workspacesViews[i].actor);
     },
 
     _scrollValueChanged: function() {
@@ -638,7 +638,7 @@ const WorkspacesDisplay = new Lang.Class({
 
                 // This is kinda hackish - we want the primary view to
                 // appear as parent of this.actor, though in reality it
-                // is added directly to overlay_group
+                // is added directly to Main.layoutManager.overviewGroup
                 this._notifyOpacityId = newParent.connect('notify::opacity',
                     Lang.bind(this, function() {
                         let opacity = this.actor.get_parent().opacity;